b1cdf9
@@ -140,7 +140,7 @@
public class ModelControllerMBeanHelper {
 
             @Override
             public Set<ObjectInstance> getResult() {
-                if (set.size() == 1 && set.contains(ModelControllerMBeanHelper.createRootObjectName(domain))) {
+                if (set.size() == 1 && set.contains(ModelControllerMBeanHelper.createRootObjectInstance(domain))) {
                     return Collections.emptySet();
                 }
                 return set;
@@ -580,6 +580,10 @@
public class ModelControllerMBeanHelper {
         }
     }
 
+    private static ObjectInstance createRootObjectInstance(String domain) {
+        return new ObjectInstance(createRootObjectName(domain), CLASS_NAME);
+    }
+
     String getDomain() {
         return domain;
     }
